Merge "Fix Telecom unit tests."
am: 4ce2b184a7

Change-Id: I0adf00c639e077f9c1cb692a9ce7a699bf683a39