[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: dc73ec0350 -s ours am: 4150044dc5 am: 4faa5ac8a2

Change-Id: Ifd9d58c19f43f1dbaf8d41ed014151d8930add83