Fallback rmf -> fi

Change-Id: I5c1e7631c575788f5c1cecdb7af8c4ced7d7374d
Merge "Fallback rmf -> fi"