Tentative rc prep for sffe

Change-Id: Ifd1463c202c9ac4df8e435cda72111867c8ebc49
Signed-off-by: David Greaves <david@dgreaves.com>