Merge "Stop setting net.hostname" am: 06178a39f8 am: 35cc49e03f
am: da70b6b287

Change-Id: I9976537d761a761e9aeca5cb15298f689032664f