Fixes for Ubuntu network setup

Change-Id: I1d7a7d9a2a4974773573f708ae3c1d243aae84dc