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

am skip reason: subject contains skip directive

Change-Id: I34987249cca51e26f2b9da5594d87606ff9e9545