Bring Device Settings to device specific

Change-Id: I78d11f8bfc76a3be7226e247ca8158dad6fba5a7