Revert "add in flo and lg2"

This reverts commit d8401e7dab8eaa12efcf905a21af86b34068d4e5.

Change-Id: I57b27934981d8e7814b9b6b4dc454769acbf2e81
Merge "Revert "add in flo and lg2"" into kk4.4