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