am 1f7d657b: am 3e809794: am e315feea: Merge "Fix handling of wrapped processes [part 1]."

* commit '1f7d657b43fd7d40c402340c02ece5beb4b28c52':
  Fix handling of wrapped processes [part 1].