Merge "Fix settings slice caching" into pi-dev
am: ab3aa6989a

Change-Id: I92edb44cecf7bede2b0c4494c6297c94e716d2f3