Merge "[VVP] Fix issue floating IP params for R-35666"