This matches the non-gapless case. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=213462936
