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

* commit 'b9994d22274d95a2234cbd8be8338d5e0c16a290':
  restorecon tombstone directory.