Merge "Clean-up settings slices" into pi-dev
am: d0888e9e5b

Change-Id: I673981e5f200b0d97649d4efcfbe69eb73bbd765