[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 878cbe0d3f -s ours am: f6b0134bea am: 898cd732ec

Change-Id: If0c11ef6dc6acf5b2c8ffb82c2148246a9cff893