Merge "Use CPU upload path in DRT"