Merge "Clean up logging of portId to piid mappings" into main