Merge changes from topic "cp_smsmessage"
am: 5a844a16a3

Change-Id: I9c155f360d9164e6ba2c71b5d01937017091aa5f