Merge changes Ibac27ee1,I336aeefd into nyc-dev

* changes:
  Be more aggressive caching Vpn preference attrs
  One updateSummary method called by all VPN prefs