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

Change-Id: I2221e3f75471b88b7bcfcc7de34c29294ae601d0