Issue: #1774 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=131389528
