Unified criteria for "signaling" (US)

Change-Id: Ia771454da13cf17770ec19fc62a8aa6f12721670