Merge "Update the uid value to the calling package uid" into main