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

Change-Id: I724fb316217dbcd84fb6c6e799d78668b4be874b