am bd229420: Fix the unhold issue especially if one is behind NAT.

Merge commit 'bd2294204e3edaede3fe81eb9b11c05c4fafe627' into gingerbread-plus-aosp

* commit 'bd2294204e3edaede3fe81eb9b11c05c4fafe627':
  Fix the unhold issue especially if one is behind NAT.