PA pie (2/2)

Change-Id: Ie7f2005eb7b2353ab65ac384654f3e540d102bcb