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

am skip reason: subject contains skip directive

Change-Id: I934f9ef30303c0657e1db8371d71d5f5c8b75a95