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

Change-Id: I871d2bdc3e95d77688c61f26e6dc27ebeddd1abc