am ba127f57: Improve VpnSettings start-up time.

Merge commit 'ba127f57ae143a0c7fad5a46b327c04eb2254737'

* commit 'ba127f57ae143a0c7fad5a46b327c04eb2254737':
  Improve VpnSettings start-up time.