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

am skip reason: subject contains skip directive

Change-Id: I49b26adc191d0b6993e049dbb17e3e0a8b2ddd41