am 439e2db3: am b86048da: Merge "Always return content Uri for downloads." into mnc-dev

* commit '439e2db3f38f0d304757651b2d9291ba1c93f2d2':
  Always return content Uri for downloads.