Merge \\\"Fix tethering re-enable after edit.\\\" into nyc-dev am: dbb5a0b918 am: cd2d94b2d1
am: 06db1cf6e2

Change-Id: Ia9ed2864fa93a01d4dbff9036b792f2fa7e717b1