Fix Ubuntu to use MAC instead of arbitrary iface name

Change-Id: Ie3bed8de63fbb38edc9d08727100238178c83d09
Merge "Fix Ubuntu to use MAC instead of arbitrary iface name"