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

Change-Id: I47d22d76e3525efc7771e6b514ebadc9b2c75e22