[automerger skipped] Merge "fixes a security vulnerability in slice provider" into qt-dev am: bc59740fe4
am: e3f595c0a4 -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 2b415a4c44 is in history

Change-Id: Iac06ef3d7f2b739798dea2b2d79ee595aebcfb67