Merge pull request #868 from google/moe_writing_branch_from_2b4dd1617e61fac3869381e9e7728b488badc5e2

Merge internal changes