PA PIE (2/2)

Change-Id: I88d26ebed22a9a2bad7a53543555c324d6d54bff