am 54b4f235: Merge "Make packet count test more robust" into jb-mr1-dev

* commit '54b4f235779385a0286675b0a2b1491ff0ebd854':
  Make packet count test more robust