Merge "SettingsToPropertiesMapper integrate with DeviceConfig API"