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

* commit 'b86048dab3df3e4a8f05de170b38c189243de898':
  Always return content Uri for downloads.