Merge "Let system_server truncate tombstones."