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