Merge "Implement vendor-available vold interface" into main