[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: c8ca6ae170 -s ours am: 7a3b38a4f7

Change-Id: Ic5ab4da39647e451af83364e78c59747721315d4