Merge commit '7198030fce4b54820a65a10d54fae18a1ab5df84' * commit '7198030fce4b54820a65a10d54fae18a1ab5df84': This should fix the simulator build.
Merge commit '7198030fce4b54820a65a10d54fae18a1ab5df84' * commit '7198030fce4b54820a65a10d54fae18a1ab5df84': This should fix the simulator build.