Merge "Remove software pno scan support"