Manual Merges

Piet code and feed wire protos are hand-merged from git repo regularly. Commits that don't touch these files do not cause changes here.

The hash below represents the last commit from that repo that was reviewed for the potential need to merge here.

Last checked commit ID: c6eb65cc4e080d96c453c677df9bf58b3abcb9b8