Merge "Fix broken Telecom Unit test."
am: 1f23bb4093

Change-Id: Ic699aeca15858a799b2b0bf48a00088dc81ccdb7