Split external-net from router extension

Change-Id: I5b7c6a3ef7a1f58e1b820caa5f02b77899d24466
Closes-Bug: #1233080
Merge "Split external-net from router extension"