[automerger skipped] Merge changes from topic "vpn_data_accnt_revert" am: cec619e577
am: 39f9c1c212 -s ours
am skip reason: change_id Ibdaad3a4cbf0d8ef1ed53cfab1e454b9b878bae9 with SHA1 4c94d3051d is in history

Change-Id: I47d22d76e3525efc7771e6b514ebadc9b2c75e22
tree: 64b2c16fd5ea0945f637180be6f2af4c62b8e600
  1. core/
  2. services/
  3. tests/