try adding in flo and g2 again

Change-Id: I1d1c5ead7d58c6d298ad02040f997190ab65719a
Merge "try adding in flo and g2 again" into kk4.4