am 03eb739a: Prefer CpuUpload path on the emulator (DO NOT MERGE)

* commit '03eb739a2acccb243076c064d6a0ce5e196a11f6':
  Prefer CpuUpload path on the emulator (DO NOT MERGE)