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

am skip reason: subject contains skip directive

Change-Id: I9514a94ced0f442d109c38cd158b8526692e984e