Merge "[FUI03] No-op refactoring of VpnInfo"