am 7e25fa18: am ebcf93e3: Add logic to fixup file contexts after a policy update.

* commit '7e25fa1859c5bccdc6599fbbd4f6344bc5bf7998':
  Add logic to fixup file contexts after a policy update.