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

Change-Id: Ic967dd59b017bd0e873ef8e65585745a6fad9875