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

Change-Id: I6ae72563a3b8088d72bcf5a22473d2649be5d53a