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

am skip reason: subject contains skip directive

Change-Id: Ide0cb64441c29fcd00ecf8e6be131b99ba206223