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