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

am skip reason: subject contains skip directive

Change-Id: I0dfbbdd5faea58cd2c54e491b4fda50d10461bf8