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

am skip reason: subject contains skip directive

Change-Id: Ib1403e8f428e246b8b212b7f8a8995f97d0961e7