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

Change-Id: Ib6eafa20ea1a4e8421014be666ebbaec0bd2e0cc