Merge changes I65b9a5c2,I9267817b into main

* changes:
  [piav2] Code cleanup
  [piav2] Simplify UIDs in PacakgeInstaller app