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

Change-Id: Ia317d9c3cadbe8d42ce7f26b0f1e96665611ffe4