Merge "Add logic to fixup file contexts after a policy update."