[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: e3c9192408 -s ours am: f567cfaaf2

Change-Id: Ic125f54131a261e5679cb31b6dd3f2933fd67464