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

Change-Id: I29238af5df6b96a28960edfadfb1c66f595a670f