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