am f9e6c8b8: Merge "Fix emulation."

* commit 'f9e6c8b8a601247e4b51fd1da293fad4e49557d1':
  Fix emulation.