[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 47cee5adbd -s ours am: bd4ecc06b0

Change-Id: I210cd4a29cfddd851c3568932080a87ce220c1e8