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

Change-Id: I3d93ee17ecf49c064b40d86eec9de0d570c34ae3