[automerger skipped] Merge changes from topic "msm_callback" am: 7e8dffc582 am: 4dc8b3207b am: 1625c4d817 -s ours
am skip reason: skipped by user jaewan

Change-Id: I4176d76daf291eb35886ddd7f7385285cc9c5cc2