Merge "fs_mgr: fix build breakage"