am 21c2c849: am b9994d22: am 8261d271: Merge "restorecon tombstone directory."

* commit '21c2c8493a8b72407690935971179f2c4b5b3d41':
  restorecon tombstone directory.