Merge "Remove routing change and Active Source update by the payload of the SAM request message"