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

Change-Id: Iba3a00da2706910d34cb53cc999047c16023cf93