Merge "Fix build breakage after GVN change."