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

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