Merge "Fix CS external dependencies on CarrierDefaultApp"