Fixes: #1176 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=112781092
