g2: update for PA

Change-Id: Ic68ba3e1c34827dc497b29bd18197f128fdbdf0e