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