Remove placeholder text in proto snippets.
Merge remote-tracking branch 'upstream/master'