Merge pull request #823 from google/moe_writing_branch_from_5b65f8c4dcf95a89d3b5ace2dbee3e54fa963722

Merge internal changes -- removes a warning from Gin.