Merge "[Settings] Code refactor" into rvc-dev am: c1b20e631a
am: 18997b6dae
am: 2544f3762f
am: c88f8b8e40
Change-Id: I3aa9f4f85862e5c32b4bae0c98120acb25642c73
This commit is contained in: