Merge "Make protobuf lib available for recovery" into main