Merge changes from topic "am-ee703ed9cd18424088a6a5e4658900c5" into qt-qpr1-dev-plus-aosp
am: 1fb18f2a6d

Change-Id: Icc6caa70c46dacf55e8330e7b65a10e467846a54