Merge "Fix the default branded VPN icon." into nyc-mr1-dev