[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: b22b4bea82 -s ours am: ad4b880345 am: a5de77ff99

Change-Id: I138f53c37b3e78b8d5b33e3f5fee4f58d42933f7