[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: e601bdffcf -s ours am: d1a106cb67 am: dca49b83ca

Change-Id: I696add7171c820867aa8254ca423191b95c3f8f2