Merge "Fix NPE from empty PackageInfo" into lmp-dev