[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 85da470ae4 -s ours am: f2a1a5a81f am: a96b6d7238

Change-Id: Ide8612d24d89f11a45e4e15c671b25ba70cef881