Merge changes from topic "msm_callback" am: 7e8dffc582 am: 4dc8b3207b

Change-Id: I387c36213524e474cf1617be02816b5acbde748a