Merge "Support device-specific DeviceStatePolicy"