Merge "fixes a security vulnerability in slice provider" into qt-qpr1-dev
am: 69018b0325

Change-Id: Ibd5810c49a728b297751891006da35f09c6975b1