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

am skip reason: subject contains skip directive

Change-Id: I1fa0eadb8387e912b9cd76cb3c1b635d1390c5c1