Merge "Fix supplimentary network connections with VPNs" am: 2b07accdee

Original change: undetermined

Change-Id: If275fabc320d51fffc7cadd92197c8ad46f7524a