am 96b87a1d: am 4ac5775d: Merge "Fix handling of wrapped processes [part 2]"

* commit '96b87a1dc0b822a057ad978de1d52990d617be62':
  Fix handling of wrapped processes [part 2]