Merge "Include file_contexts conditionally elsewhere"