[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 540a2e4c74 -s ours am: 99f9ca9a69 am: aa0012160b

Change-Id: I95bda563f2cf3dadba174ff1ce5c74acc7e0a6fd