[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 7bc65fcf0a -s ours am: b985ec96a9 am: f4ac534484

Change-Id: I1e8c2810d5d66790e87a46a3fb1c309b80d545ff