Android client fixes on file implementation.