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