Merge "Remove incorrect check for sa_mask in signal chaining"