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

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

Change-Id: Ie8e1df9485816e4ae11f1de37d352efd466eafd2