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

Change-Id: I7feead64e6fd1c4a02ccaaf4a76f1ad684887e72