Merge "Fix simulator build, part 1/n"