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