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