Merge "psh_utils: Clean up log printing" into main