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

Change-Id: Ic45939644d23e8eabe2ae67da4614092e5570750