Merge "Improve efficiency of using the DataSource abstraction." am: 7353eabd14
am: 732b29a5c3

* commit '732b29a5c38a3a33bdffea662875e6a8dab894b3':
  Improve efficiency of using the DataSource abstraction.

Change-Id: I4b2e05ffc80d59ef19a1b78c3560f0d21c5b04b2