Merge "NativeTombstoneManager: fix tombstone parsing."