Merge "Ensure calling package name and uid are matched" into sc-qpr1-dev