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