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

Change-Id: Ic53ad1fed518057d75a59fd7d91dd7f4882700ce