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

Change-Id: I42f6774aed0638e9c6574c0f5332c3c235ac07f2