DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp@6304901 into stag-aosp-master am: 540c1b4e82

Change-Id: I62ac222ff70fcaf56f0565fc8b51c7ba95857286