Merge "Corrections to the USD Vendor AIDL interface." into main