Merge "[incfs] Cleanup data loader connection and fds in Java" into rvc-dev