Merge "Fix the default branded VPN icon." into nyc-mr1-dev am: ebf98c1515
am: 0dd8d66fc0

* commit '0dd8d66fc0a17c2cbcdf973eb56f61ce10a105e1':
  Fix the default branded VPN icon.

Change-Id: I882957a5ee32ba19c1c522211fc4aa2d95908170