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

Change-Id: Ie3a6a3840bf047e8ba6126e563c93cba374b4d8e