Merge "Update VID for AAF/HTTPS"