Merge "Add DeviceConfigOverrideRule" into udc-dev