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

* commit '472e49de36737f528fbbdf5adde51f1cd47eef22':
  Fix PackageTest#testSinglePackage