[automerger skipped] Merge "Move implementations to DataSourceBase.h" am: 58ae37b5b3 am: 9e9baf28a4 am: c1d95ec287
am: d35962c847 -s ours
am skip reason: change_id Ic955189ff9f0fbc48b5b35eccdb2916dc79fdb0f with SHA1 45bee32c4c is in history

Change-Id: I001f455dcd6e62224f563dc23295430e8821dd91