[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6304901 into stage-aosp-master am: f2b775744b -s ours am: cb01ccf7e5 am: 63ed50eadb am: 80cc65f51b -s ours

am skip reason: subject contains skip directive

Change-Id: I775d4e07a414162113d8796a4d6833eba41ecf14