Merge "Fix vpn branded string usage" into nyc-mr1-dev am: 9db47b0f49
am: e28705ac90

Change-Id: I67337d3d11b2c21175ad64a2c841191b40127d78