flo: updates for AOSPA