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