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

Change-Id: Id89ab1373d9cf633d9fae45131f18eabc200a8f9