Merge "[Settings] Avoid access Controller from Slice"
am: 5fb5d21b2d

Change-Id: Ie946dc9fe7ec3dcb6634386e4498b118fa2f8faf