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

Change-Id: Ib62285494ffee7a4c35bc3583417e0cacc0d5d83