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

am skip reason: subject contains skip directive

Change-Id: I98bb91e4b474737d35faa73c5672472701f2b1ef