Add the rest of Device Settings

Change-Id: If4bffffbb0e0ae83d1e8f8b34be22d14aa33f64a