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

Change-Id: I5da271b0f113844b7ad393a051078af602fa518d