Merge "pm: Modify getPackage() to only return non-null packages" into pi-dev