Merge "Fix DirectReply bug when reapply fails" into nyc-dev
am: 6510bdeada

* commit '6510bdeada8b670b1c9863fdb7b518e161105c09':
  Fix DirectReply bug when reapply fails

Change-Id: Ie4b164d285b25ab359b087e7d002c4cdf97dd3ee