am 8261d271: Merge "restorecon tombstone directory."

* commit '8261d27115746f58a6bbf37e6dcf18a093ee8c85':
  restorecon tombstone directory.