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