Revert back to PAC-Motorola

Change-Id: Icb21583f3108d762991f4a9f8f0c7dc51f1a1fb9