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

* commit '9fc2cb5937728373375950255a00f0b6e91fa86b':
  Fix alternative signaling for native handles