Fix for external network gateway

Change-Id: I7565f6133fa5c22471a7047a4f6e029e00be10de
Closes-Bug: #1264107