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

Change-Id: I09ba87cf5c1f1a0099119a015fdd113a3da2375c