Merge "Sync with upstream findfp.c."