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

Change-Id: I234bf03c66af2f7bdd9247ca101fe387b7f8e002