Update to master branch of deps.
Merge branch 'update-code-gen'