Merge "Slightly improve dumping packets" into jb-mr2-dev