Merge "[PT17] Small cleanup of PacManager"
am: 1f1bdf26f9

Change-Id: If5c8f840adaa9dd13e5cf95aedc782913aee9179
tree: 9685ad110c79c2f993db9699d06db533918608ad
  1. core/
  2. services/
  3. tests/