Merge commit '08be55b8ea917a5273c135a7bdc73e41c8524c05' into eclair-plus-aosp * commit '08be55b8ea917a5273c135a7bdc73e41c8524c05': Add null checks when scanning a package.
Merge commit '08be55b8ea917a5273c135a7bdc73e41c8524c05' into eclair-plus-aosp * commit '08be55b8ea917a5273c135a7bdc73e41c8524c05': Add null checks when scanning a package.