[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 472a1c3569 -s ours am: 3d7b903c48

Change-Id: Ibdb104eb6abd1375b0e037a5a78a5b85a42efbc2