Merge "Correct Telus gid" am: 198c084e32 am: dab961a1c8
am: 6f6b9bc53f

Change-Id: I1e55d1ace04aad75bb4ab1dceaad7ae94f01ef4f