Merge pull request #821 from google/moe_writing_branch_from_76be88e8140f77a25824f5deb67bb13b8e5dabc6

Merge internal changes