[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 7dee80aacf -s ours am: dc71887f83 am: 3f3fd5269e

Change-Id: I738a78403160d4af2e503576f72b968e4aac02a9