Merge commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e' * commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e': Attempt to fix simulator build.
Merge commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e' * commit 'c81ec79d1f88ae8a80e08560a56845655a74f67e': Attempt to fix simulator build.