Plus misc fixes related to the added samples. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=132891534
