Merge "Nuke all reference to /etc/ethers" am: 41a0b2e1a4
am: 1f3c672bca

Change-Id: I3e25b1071652ba74708234290a9eb70ffe6f18b8