Merge "[Settings] Code refactor" into rvc-dev am: 5bc8aa7961
am: c1eb5bf440
Change-Id: Ib2f4ae565af3656f496d0ca20da7af22ffd1cdb8
This commit is contained in:
5bc8aa7961
am: c1eb5bf440
Change-Id: Ib2f4ae565af3656f496d0ca20da7af22ffd1cdb8