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

Change-Id: Ia65088132a08f89f2d763cb36055ea014de4443e