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

Change-Id: I5f35e53048993fee9af7731734aa5f87380c8148