Merge "Fix NPE in reading package-usage.list file" into nyc-dev