Merge "[AWARE] Remove (hide) sendMessage with retryCount API"
am: f81911bcd2

Change-Id: I3791ee5fbd0c16de6156b0ad36e50091eea498f9