Merge commit 'c067ef5f5a58ec3c44e556b5c2b012f9ac22f40c' * commit 'c067ef5f5a58ec3c44e556b5c2b012f9ac22f40c': Add a null check in PackageParser
Merge commit 'c067ef5f5a58ec3c44e556b5c2b012f9ac22f40c' * commit 'c067ef5f5a58ec3c44e556b5c2b012f9ac22f40c': Add a null check in PackageParser