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