Merge "Follow supportlib changes in SliceManager" into pi-dev
am: 96910a6dc2

Change-Id: I553c13a822d3944bd855575638680a29eedfba2e