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

Change-Id: Ib5d9509b0faac20e6b222cea407d84754c21bede