[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d3ca045d6d -s ours am: b9e70d0cc3 am: 68fbeeb0dc

Change-Id: I3b39ce0cb71d9c01f5836c6ef5ec9d2081e00833