Merge "Fix flaky signal tests." am: a5e0d695fa
am: c9cbca8189

Change-Id: I9b8f055b4a4ea03898b1ea49eb15f0c669878535