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

Change-Id: I91bb1f015278f3dad67b74b4d1b25a7862ffb913