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