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

Change-Id: I293607cff0a3bab8653eeadf10a7c70da86656eb