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