[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: 3ccb3101 -s ours am: 4456c31a am: 843b540d am: dfa4491b -s ours am skip reason: subject contains skip directive Change-Id: I58926ab7a6c1e03a84982e175608330ab7ed4511