Merge "Fix Telecom ConnectionTest." am: 3722ba37e8 am: 6974530a07

Change-Id: I4c2ef670c505137f3e9d1c3a9b80b571412f5fbe