Merge changes from topic "vpn_data_accounting" am: 6c93e5378a
am: 09ef7691f5

Change-Id: If4fff1b4d14e80e024ce7b1aa85ebd3afcb1ecc2