Merge "[Upload] Async upload code cleanups."