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

am skip reason: subject contains skip directive

Change-Id: I43a2e588aa69070a2a3056644275e59be492fed0