am cf0dd28b: am a80adff3: Merge "emugen - fix wrapper context naming"

* commit 'cf0dd28b871cfc45d66f6814c561777c6a3ad7be':
  emugen - fix wrapper context naming