[automerger skipped] DO NOT MERGE - Merge qt-qpr1-dev-plus-aosp@6382244 into stag-aosp-master am: eb3b5d800a -s ours

am skip reason: subject contains skip directive

Change-Id: Ie594ab880b38fed48017807c96cd10316d16e437