Merge \\"Fix NPE in reading package-usage.list file\\" into nyc-dev am: ec3f8409b8
am: be880349fa

Change-Id: I690242d94b1a80a8ad1564215cd4e579614429b2