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

Change-Id: Ieaa0a16857b87ff99f9661e1d2c3583d36198409