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