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

Change-Id: I6fc88fd0f60c2b17e86fe7bf0519e5be8a56e51e