DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp-without-vendor (6129114) into stage-aosp-master am: 7b2064edd5

Change-Id: Ia2f34996da33b6f92568377afd40f2b6752d71bd