Merge "Add UID printing to tombstone headers"
am: 79474ce6f3

Change-Id: I9284850d1dafe216e44feb041c21ca78a8ec64ee