DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 9b77cfa2be

Change-Id: Id4065b817b7c6560c7e1594b1de42123034cf659