Merge "Bug 865: Fixed incorrect conversion to new APIs."
drwxr-xr-x - code-generator
drwxr-xr-x - model
drwxr-xr-x - yang