Merge "Add unit tests for FileContentsHasher"