fm: update for mr1 based solution

Change-Id: I75aad03f786748b12fa9bc87e9bc10bebf68e73d