Merge "Make `ApiUploadTest` up to date so it passes"