Merge "Fix alternative signaling for native handles" into nyc-dev
am: 4e82dc4004

* commit '4e82dc4004ed361057d418c08e2b3b698a75e261':
  Fix alternative signaling for native handles