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

am skip reason: subject contains skip directive

Change-Id: Id047e90f68e1d1356dc1fb565997467dfafa4c82