Merge changes from topic "cp_smsmessage" am: 5a844a16a3
am: 9c9c799526

Change-Id: I68a32cf76bb643ce92a342b3be06098d30ea2ff3