Merge "Add a basic test for vendor apex update"