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

Change-Id: I10268dafcc6e81eeedb270c85519ebd8f6ad1a82