[automerger skipped] Merge "fixes a security vulnerability in slice provider"...

[automerger skipped] Merge "fixes a security vulnerability in slice provider" into qt-dev am: bc59740f am: 023af61a am: 511160a9 -s ours
am: bb041071 -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 2b415a4c is in history

Change-Id: Ic76367fa17123b403ddd5d10794cee238309fd9b