Merge "[AWARE] CTS for failure mode of send message API" am: f138c95d1f
am: 3ceb23d6ca

Change-Id: I32956bbfd809dd92a1062b868dbb66377210ef02