No functional changes - except protobuffer is mandatory and not optional now. Former-commit-id: 1e6347e708707cc388cdedb8d0352a9f017030b8
Former-commit-id: 86e560e0d4f03251ee08a648ffa6fd9a0e01ae78