[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: d6712d6b84 -s ours am: 53b34c3e78 am: a864175111

Change-Id: Iad0a51f6af5d64a5bcd474a55097a06ae1571990