Merge change 5979 into donut

* changes:
  Remove the constraint to assign new uid when code path changes for system packages