Merge "Include vendorsetup scripts in order"