[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 38afee1136 -s ours am: 6a6934c810

Change-Id: I7bd8f00e123bcc542c325ee9fe925a23a06a8ba2