Merge "DataSourceCallback: fix java docs"