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

Change-Id: I899c46a6b7df425a0ebfd22965c90bd304627edb