Merge "Use the proper size for tb_fw_cfg_dtb" into integration