Changes for cm10

Change-Id: I8d7a6f5638db67236701ec3ef160395577109852
Remove DeviceSettings for now

Change-Id: I14afa975680b34e2702689441b2c6b3aa70c66dc