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

Change-Id: Ia9f2e65710a94f314f8bb2b8ec875088c9ccc59f