am b20b0629: am 71dfc7e9: Merge "Memory leak in parsePackage"

* commit 'b20b0629c2ea6a8e1f7bebd0791dd21e545a4605':
  Memory leak in parsePackage