Merge "Set up platform flags to use for enabling proto tombstone" into main