am 7fea449b: Revert "ProtoBuf update"

Merge commit '7fea449b53848057686ac4266ee51853bda70e30'

* commit '7fea449b53848057686ac4266ee51853bda70e30':
  Revert "ProtoBuf update"
tree: 1f1a5ba1039a0ab62dac27735c0ecc23dc11d9c5
  1. src/