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