Merge "Fix flaky signal tests."
am: a5e0d695fa

Change-Id: I9aae6c550e66a3bdc5f3278a1639b1f4ca88e4ac