am 60b4afed: Merge "Fix account filtering for specific package name" into jb-mr2-dev

* commit '60b4afedbeea11983b748d0d8ea9032d177dd6e7':
  Fix account filtering for specific package name