[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 6d6c9c7e26 -s ours am: fd31f4821a

Change-Id: I5163ea46a4b3708ede80911164eacd430b5aabb4