Merge "DirectReply: Fix bugs when replying from HUNs" into nyc-dr1-dev