Merge "Un-@hiding some missed VT APIs." into mnc-dev