Merge "Update javadoc for CARRIER_ID to be used to match carrier info" into udc-dev