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