Merge "Adjust type hints in file related classes"