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

Change-Id: I6cea62ccda0fe486658737869c0ccdf02909922c