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

* commit '211f9fb14bb204044ce657c71a1d870b7ddcc0a0':
  restorecon tombstone directory.