Merge "Add support for send Message with messaging options" am: 1400db6748 am: 340b410675
am: 002a48f361

Change-Id: I03c4dce0682a4c1f8b5fffd9501e006668deff2a