Merge "[PT17] Small cleanup of PacManager"
am: f9bb1a998f

Change-Id: If5c8f840adaa9dd13e5cf95aedc782913aee9179