Merge "CDMA MO SMS follow on DC feature" am: 8449733719 am: 10e016459e

Change-Id: I3a3737b650ccf6f3ea1ca95ce5b268e4c52bd837