[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 976d18eee9 -s ours am: 1faa5d4d65 am: 8a7df8b873

Change-Id: Ied0c8ee3efd1a4934b4d6ad6ccdbb16e37194bfb