[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 7cbc056461 -s ours

am skip reason: subject contains skip directive

Change-Id: I5875207a10bdfe3b4322022b8aae0a9480ce3bda