Also remove some unnecessary line wrapping. Test: atest TetheringTests Change-Id: Ia7638b3198d7811cdbb34e959c50608cf1a656bf