Use new SF hook

Change-Id: Ib357cc39c5bb62e164e93fdf4c3d7ddd834998a4