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