Merge changes from topic "sms_trampoline_intent-qt-dev" into qt-dev
am: 8b2d80c768

Change-Id: Ibbc07c961f1bdc19e1015885487e9f7b6a14fa83