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

* commit '053ffa6d7c897215fecc4fa85be50f2e82a39640':
  Fix DirectReply bug when reapply fails

Change-Id: I2e415fef0edb01944be4dfdc6f0067fa9e2ead5f