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

Change-Id: I0c7c425c6a8b0ee9ee7ae4695bb7f62b1e75da79