Merge "Stop adding large proto tombstones to dropbox." into main