Device filter for DeviceSettings

Change-Id: I9cc86768ec6a953d96411483ca783a56ba38caf6