Merge "Update the FDO support:" into lmp-dev