Merge "Revert "Add logic to handle changes to file_contexts during update.""