[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: ed0b09ce72 -s ours am: 1aeed42113 am: 69aceabdeb

Change-Id: Ia3c3f4350ba2b8dc977d33b500a2837f3dc2606c