Merge "Properly escape dots in file_contexts filenames"