Merge "Merge "Fix DirectReply bug when reapply fails" into nyc-dev am: 6510bdeada am: 06a49b1e93" into nyc-mr1-dev-plus-aosp
am: 97cbc0ad3b

* commit '97cbc0ad3bc17f1f67d99054d1e5b36cf7107888':

Change-Id: Id339b6a6af173e8e99be72292033fc94b3752f9e