LM changes that did not make it into code.
Merge pull request #275 from alxhub/proto-full-types

Proto changes that didn't get included in the last submit.