Merge "Improve DataSource interface."
am: ce4c9d7108

* commit 'ce4c9d71080d27ce321b1aa49e2189ee55bb25fa':
  Improve DataSource interface.

Change-Id: I8a1df06ee64785ae48414b2468e760c41d7f41f3