Revamp Custom Settings

Change-Id: Ib551ad001ecb0b251ec3fc4a0156653adec460f9