Merge "Fix Telecom unit tests." am: 4ce2b184a7 am: a17d44305c
am: 20ef5ef13a

Change-Id: I18294d80c0fc11ac2728f6e302489aea03d51264