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

am skip reason: subject contains skip directive

Change-Id: Id250d317180a1b084ac27178ef22b8c6db08f797