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

am skip reason: subject contains skip directive

Change-Id: I64a11df53d52e403e076eb9341f589b3102de4c4