Merge commit '5e782937ead3042255d83f9c1192f2cc7b688d74' * commit '5e782937ead3042255d83f9c1192f2cc7b688d74': Fix simulator build (1st attempt)
Merge commit '5e782937ead3042255d83f9c1192f2cc7b688d74' * commit '5e782937ead3042255d83f9c1192f2cc7b688d74': Fix simulator build (1st attempt)