Merge "Add support for send Message with messaging options"
am: 1400db6748

Change-Id: I29ffbb64c35214761b7f6921212920cf8ffc8599