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

Change-Id: I260df56cc456341ff306e871488ad99ab572d094