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

Merge "[automerger skipped] Merge "fixes a security vulnerability in slice provider" into qt-dev am: bc59740f am: e3f595c0 -s ours am: add9e2eb -s ours
am: 503e3e03 -s ours
am skip reason: change_id Ib1b4fba54ebd3599fe11021d21dc9b09d34e8965 with SHA1 a6364d92 is in history

Change-Id: I66859a89d8c73a6bcbc69d8f16296e6f7ce4ab89