Merge "Change "Device sensors only" to "Device sensors"" into klp-dev