Merge "Remove obsolete file contexts"