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

Change-Id: Ied0234836a778dc1f1faa23c072276edf3332256