Flo support

Change-Id: I56e5c5291bb08bbf18e52e74b5e9ff58ad1fc57f