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