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

Change-Id: I9aab657dc09bed5eebb6dcf98b7fba3b3747f2c4