[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 38470093f3 -s ours am: a9da52ba83 am: 06c297ea1e

Change-Id: I635ed10ebb0fd4ad93f7fff4310457370ac3e90d