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

* commit 'b07aac4e95b192b880ce3c5406dbfbf06b1f000f':
  Fix DirectReply bug when reapply fails

Change-Id: I127a782f9ef492f0bd309433733df4a49b893879