Merge commit '3d14b1a17066b57b579859c246da1397f4e0a123' * commit '3d14b1a17066b57b579859c246da1397f4e0a123': Fix simulator build.
Merge commit '3d14b1a17066b57b579859c246da1397f4e0a123' * commit '3d14b1a17066b57b579859c246da1397f4e0a123': Fix simulator build.