Merge commit '36704bb8ffd433450994c0260c411bfa9424326d' * commit '36704bb8ffd433450994c0260c411bfa9424326d': Update CdmaSmsTest unit test.
Merge commit '36704bb8ffd433450994c0260c411bfa9424326d' * commit '36704bb8ffd433450994c0260c411bfa9424326d': Update CdmaSmsTest unit test.