Merge "Fix Telecom ConnectionTest." am: 3722ba37e8

Change-Id: I5471a86ced663e344bbeb17fd4c5f5eb02d8755a