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