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