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

am skip reason: subject contains skip directive

Change-Id: I3ee9e55efe8028cb5ccd53ccc44fb6677f7e47af