Merge "Replace usages of hidden Telecom APIs"
am: 8b24a19f91

Change-Id: If1dc0d71ef6335d852eec3544a3c15daeccfc33f