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

Change-Id: I921018451e44f873768f723232628e932c9b7827