Merge "Sniff: Use correct sniff configuration for PAN & HS" into mnc-dev