More FF updates.

Change-Id: Icea16ddff8f106d2e35e91ef72af206fbd80b4d8