Merge "Fix the 3G icon shows as G."