Issue:#3149 Issue:#4016 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=193664294
