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

Change-Id: I9e4cf1680ec719bc1fab9df36ad08229401da1eb