Merge "Let apps provide a custom data source for extractors" into jb-mr1-dev