MFC r270063 (vtnet)

The vtnet changes were not originally merged in r270252 since
r268480 and r268481 had not been MFC'ed.