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