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

Change-Id: I40b6eef84e5d44b1c185f9818953a6dba8dc9adc