am 7c8318c0: Merge "PackageInfo is a class, not a struct"

* commit '7c8318c0e85540739afba3e8c0f922176bc299cd':
  PackageInfo is a class, not a struct