Merge "Fix DirectReply taking too long in HUNs" into nyc-dev
am: 3c37f6ed06

* commit '3c37f6ed06adec414419365b745ac34d25fb2780':
  Fix DirectReply taking too long in HUNs

Change-Id: I7b2e0d97d29171064e8a3f86e70a27c6bebb98c3