Merge "fixes a security vulnerability in slice provider" into qt-dev am: bc59740fe4
am: e3f595c0a4

Change-Id: I9462bb67bf30732d570c8b84a0d9e4839aef9be4