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

* commit 'bffe377bca3cb8240bfc614c12fd1091ae3f69b9':
  Add logic to handle changes to file_contexts during update.