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

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