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

am skip reason: subject contains skip directive

Change-Id: Ia0c335d109d514a265db752851ccba57ff5376ea