[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 2fc2488744 -s ours am: c73aebe3b4 am: 85090d0fea am: 9fa9117c05 -s ours

am skip reason: subject contains skip directive

Change-Id: Ib1d594a5ac9b0c7540f2e2ef418d00e17cc98952