am db7523ad: Merge "Fix PackageTest#testSinglePackage" into jb-dev

* commit 'db7523ad7b6252b269c24d9ceecc990b53d60f1a':
  Fix PackageTest#testSinglePackage