[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: bc2c965574 -s ours am: 506335de19 am: 69afb6b861 am: a815250b76 -s ours

am skip reason: subject contains skip directive

Change-Id: Ifa7b6ec57c327f47b6007fcbe32299be00e12780