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