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