Merge "Move implementations to DataSourceBase.h" into qt-dev am: 1142d3ea28

Change-Id: Iec56bcc48e52c69db03489d4ce683c81113d67b5