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

Bug: 151763422
Change-Id: I8eadedc148f7f5a5a59c1ba831712ca49f2e5719