Merge "Fix leak where system held onto slice providers" into pi-dev am: a2b1e5f013
am: a66cf9ce0c

Change-Id: I23b3d9928098684e65d5791efdcbcac19225c8fa