Merge "[Settings] Code refactor" am: a7a9863a52
am: a99bfeadf9
Change-Id: Ia0c95ff025def6a48d1b84b7f499447912757c72
This commit is contained in:
a7a9863a52
am: a99bfeadf9
Change-Id: Ia0c95ff025def6a48d1b84b7f499447912757c72