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

Change-Id: I5bd94614143492bd188067b71c4257fe1143b9f8