Merge "Wrap proto namespaces in unique name." into main