Merge "[PackageUsage] fix NPE" into tm-dev