Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 am: 155c698d4f am: a170198f0b
Change-Id: Ifdb5aa5bb04191ce3d00b3d9f885ef6fd2664971
This commit is contained in: