Merge "Don't use stable providers for slices" into pi-dev am: de8e3c227c
am: b9e5da09b5

Change-Id: Ia10ee4f9ca75d4bba58aa33e386fb929e987a68a