Merge "Follow SliceManager API changes" into pi-dev
am: d68ed5c92c

Change-Id: Ice176c79605250c263a21cbc624b438902dfaedc