AOSP-JB4.3: Fix compatibilty with PAC

Change-Id: Ibdc458faba24ff5a39564b85c269b9be0ca13508