Readd FM support

Change-Id: Ic6487100317f9855379bc3cb6ea42c79ff3ff538