Modify for PAC

Change-Id: I2b66fddfef96e2d0d8f6673e50d79b6eb3c6f08a