Settings: House keeping Part 2

Change-Id: I1c0e96a1de4b9be7d77c61bf279338f9fbcd6aa8
Signed-off-by: Lokesh Chamane <lokesh.c703@gmail.com>