Merge "Revert "Add support for send Message with messaging options"" am: 563d93c107
am: b1ba135258

Change-Id: I874df0b3061ef2f22de6d1c5f9338aa395092ee8