Fix merge conflict with cecProtobufDev