flo: updates for AOSPA

Change-Id: I8f95ebbafe47893b4fdee9290e452e11b39fa1ea