Allow to have a different internal address and public address

Change-Id: Id87323393a3bfd0ac3c9bc80fa2f46775e102eea
Merge "Allow to have a different internal address and public address"