Merge "BVI fix for L3 scenario with LISP"