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

Change-Id: I5bafc9c83458096a3367d92214b2eb79efb227f4