Merge "Move implementations to DataSourceBase.h" am: 58ae37b5b3
am: 9e9baf28a4

Change-Id: Ia23bf1d39a8e8cdd48356a4bddb64b9c3ff6e3fa