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