Merge "Add logic to handle changes to file_contexts during update." into jb-mr2-dev