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