Bring in SFC support

Change-Id: I42673ff1529a082185564592d2d709a8e3b57acf
6 files changed