Merge "Fix Javadoc errors in CarrierService."