[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: e61bd38e63 -s ours am: e11222d547 am: 8ef098ef87

Change-Id: If579c8b4ea892ab2ed35dfd0ed3e8b97b048f18d