[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d3ca045d6d -s ours am: b9e70d0cc3 am: 68fbeeb0dc am: 19d4803084 -s ours am: 597ffe4c60

Change-Id: Ia44df77f757cec8dc9f22e0c853c8d694c54da23