Merge "Fix deadlock when ParallelPackageParserCallback is used" into pi-dev
am: 4170ab233d

Change-Id: I6e460544a030e58e3a92fe724f0be700c6ce519c