Small reorg around reuse of  network_flat_interface_name and  network_flat_interface

Change-Id: I599aa2e7d9f350b69fce1a122d51c20aa58c02f1
Merge "Small reorg around reuse of  network_flat_interface_name and  network_flat_interface" into production