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