[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: dee39841b4 -s ours am: abb30ef928 am: bb8a23855a

Change-Id: I9dac5029d75ad0c040d46cf5e859596d70b4741c