add WIP (partial) fm patches

Change-Id: I499516bd49c71a1cb45a67a61e380e248f61b780