[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: db001d9190 -s ours am: 3cdba74637 am: e7e732fc82

Change-Id: I69c3920e0f508b4e6abd877c74d1b5b92cc98396