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