Merge changes from topic "settings-vpn" am: 70f90282ef am: 1758c298d0 am: 3d6f91ed37

Change-Id: Idac6e83bab50b818e2776f28da380f08000e2a42
tree: 6fbd76f74763ab3de587adc52c1e7225ff99292d
  1. core/
  2. services/
  3. tests/