Merge "NativeTombstoneManager: catch ProtoParseException."