Fix FM issues during builds

Change-Id: I9d59b00614786b716fd3d2177a09c9794e4c46e1