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