Merge "Replace usages of hidden Telecom APIs"