Merge changes from topic "settings-vpn" am: 70f90282ef am: db9074340f

Change-Id: I2e4fdab485b9a94e8b2f121b21269f374b21dcb9
tree: 7d4689f00266c8b2a68d28ce3ef472993960782f
  1. core/
  2. services/
  3. tests/