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

Change-Id: I20e0da9e5f334ea05cb69ebe88ccbed3899fc72a