Merge "Make packet count test more robust" into jb-mr1-dev