Merge changes from topic "cp_sms_trampoline_intent"
am: 781ac9ef8e

Change-Id: I116fbe433d004f67703b5b2f7e3e47b2d87a9c4e