[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 90e45fec56 -s ours am: 70a8d2affe

Change-Id: I5cf57a77d7e146d425f8dc37536468ff8bb21b4c