am 9701b3d5: Merge change 5979 into donut

Merge commit '9701b3d594868bd6750d5887af560c6295ea091b'

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