Fixes Github issue #1015 ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=109559497
