Merge "Fix potential null package name" into tm-qpr-dev