Merge changes from topic "vpn_data_accnt_revert"
am: 8af90ce15b

Change-Id: Ia91063f54fadcdf3f12e44b80bad1173f5b4962f