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

am skip reason: subject contains skip directive

Change-Id: I75bbfc53e8328915c50c3a916154c27cc25b8399