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