[CORD-2871]
Fix protobuf integration in prep for CORD-2276

Change-Id: I67ffa17d97d97e9a226269e99de76c236a431dd1
14 files changed