Applying the stable/Helium release patch for SFC

Change-Id: Ia4109fdbf32a023dd10c5d774646696bcc3aeb44
Signed-off-by: Reinaldo Penno <rapenno@gmail.com>