Merge commit '0da3bdb476086db02a1076780676b21e239c79d6' * commit '0da3bdb476086db02a1076780676b21e239c79d6': Fix public API caused due to CDMA changes.
Merge commit '0da3bdb476086db02a1076780676b21e239c79d6' * commit '0da3bdb476086db02a1076780676b21e239c79d6': Fix public API caused due to CDMA changes.