Merge "Atest: Refactor upload flow to public"