am fa78fe0d: Merge "Make sure the ThrottledSource reports the proper mime type"

* commit 'fa78fe0d70fe7e6a9eb19680888b617ea57eaad4':
  Make sure the ThrottledSource reports the proper mime type