Flo: Align to latest PA changes

Change-Id: Ifdfc832b5f57d2228cbe87a2a5f612813fd9740b