Merge "Don't complain if a VPN changes capabilities." into pi-dev
am: c58ef904d5

Change-Id: I26d2e1526c21ad2bac369a565b06155780190692
tree: 7965b7053af953f61034665fdf7162d7fbbd1bce
  1. core/
  2. services/
  3. tests/