[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: fbb37525 -s ours am: f8194e47 am: 5793279a Change-Id: I166164eec440265e03f512ad0fadc70848c4fbc1
mentioned in commit 2df717e3