[automerger skipped] Merge changes from topic "vpn_data_accounting" am: 6c93e5378a am: 09ef7691f5
am: 112b8bd6c5 -s ours
am skip reason: change_id I230c1edbf64cfeb3dbb560db368b5e420f7b79a4 with SHA1 e62e287511 is in history

Change-Id: I193b9d8190a4cda863d89d9babb680201fa3f125