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

Change-Id: I62602fc4b8f9b7e6e995c88750db5d77ed413df8