[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: c8a0fec691 -s ours am: 46746da301 am: dd20e69d7e

Change-Id: I382dd40db389858e12b34492ae5c6668fd888975