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

Change-Id: Ieb10d1f9633b1cf6afbe20a40456a732adf772c0