Merge "[AWARE] Fix message length limit comparison"