Merge "[Setting] Code cleanup" am: 126df6441b am: 9d556441b4

Change-Id: I956cb317ec98a5f6e9083b46f949451cf7e84613