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

Change-Id: I2b558278b13a6e30000b8a3b5a0f6b91d8d4ad7c