[AWARE] Fix message length limit comparison am: 8685e078c9 am: af95ae8575
am: f5c1120540  -s ours

Change-Id: I324e42a2d0726d01999447b9603ade45b0b19dac