[automerger skipped] DO NOT MERGE - Empty merge qt-qpr1-dev-plus-aosp into stag-aosp-master am: 70ce3f23e9 -s ours am: 824b99c5ac

Change-Id: Id928c6959e400c9aec9344a259e8cd43a9193bfe