Merge "Fix UploadService unittests."
am: c7f65d2859

* commit 'c7f65d285980c86ad924985d1bb07842fb99d702':
  Fix UploadService unittests.