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

Change-Id: Id261566422c4af7a3ce65877ba04b0a401685c23