Merge "Correct for signal, native bridge test hard-coded signal handling values"