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

Change-Id: I8a51a832ad2b439f09e8a4408542a9358b5b4333