Merge "media: correctly return cached size for MediaDataSource" into nyc-dev am: 64389e25ba
am: a840b0f287

* commit 'a840b0f2879df4a8ab0b4d622e9927c935eca860':
  media: correctly return cached size for MediaDataSource