Also backport the Shield workaround to v1. ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=144446498
