Merge changes from topic "vpn_data_accounting" am: 06b4b6f92e
am: f714bf2fad

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