Merge "Cherry-pick "Fix VPN notification helper" from master." into honeycomb