Merge "Stop setting net.hostname"
am: 06178a39f8

Change-Id: Id03d2f8bf6fa8b447c5f32d3d2a51faef193ba62