Fix PAC products

Change-Id: I9c8a789db74890e4f5f4e3bb7d175f30112c8f33