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