Merge "[Settings] Code refactor" am: a7a9863a52
am: a99bfeadf9
am: 6714c01dd6
am: eae9ffda6a
Change-Id: I7159f7c0f5d2254eaa5b242f0400653dc6717fa0
This commit is contained in: