Fix FM issues during building for S4

Change-Id: I3a94f56ec46c2a9416562e20e9f2732c82b622d6