Merge "refactor(fdt-wrappers): fix for unit testing errors" into integration