Update: Fixed android DataSource
Merge origin/master