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

Change-Id: I0539d1f7db3a307f7fb0b27e0b2a3a3e13a71538