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

Change-Id: I4681275fcd275a986c826d59304d9e812340d7be