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