Merge "Fix vpn branded string usage" into nyc-mr1-dev