Merge "Don't check pkg<->uid when called from internal"