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

Change-Id: I130760913149185f5cef084d9a239ad35a4fad04