am c4ddf16c: Merge "send without timestamp is not equivalent to send now" into mnc-dev

* commit 'c4ddf16c8b25d544096f22fbdc491a0c627c1a79':
  send without timestamp is not equivalent to send now