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

Change-Id: Idd6210be3a607bff4add7d42639a294142c9cb85