Merge "[Settings] Code refactor" into rvc-dev am: 1ab100e936 am: 91f2c3d931 am: b4c2f8c4d9 am: 45dbbfa3fd am: d14beedc47 am: e72bf7fd92
Change-Id: I755a7023b795ec8df91055ffd649ccd0d3362ee7
This commit is contained in: