[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: d4eef49c06 -s ours am: 82e0a5abfd am: 6e523d84f6 am: 50b9b4f625 -s ours

am skip reason: subject contains skip directive

Change-Id: Ibe48c44c3966786848fb72cabbc96453de0ecd53