Merge "Add support for sending message with priority, link control and validity period options"
am: b103f9309b

Change-Id: I0a641c9d8d4bf7ce9cf78333f68424cea5c879df