add flo/grouper support

Change-Id: I94b7dffee5e8b52afe1e93f8436b148ddb3718db