Merge changes from topic "vpn_data_accounting"
am: 06b4b6f92e

Change-Id: Iaa4b2dd9be2fc6e9833c6c846b6858aab507ca8b
tree: 193e99c1da73d267fded35046e9b212fe7b72f9d
  1. core/
  2. services/
  3. tests/