Renable features used in DeviceSettings

Change-Id: Ied10a9d66c98ad6161ccef98d1ca5e297b8fb73a