am 25438e21: Merge "Use CPU upload path in DRT"

* commit '25438e2199fe0083639c76311d698a0a20446349':
  Use CPU upload path in DRT