am ed8cf61b: am 2ee4589e: Merge "Correct for signal, native bridge test hard-coded signal handling values"

* commit 'ed8cf61b841d40bdabd60f633b2c3ef036cb8f3a':
  Correct for signal, native bridge test hard-coded signal handling values