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

Change-Id: Ic67c1ed8a63103476b2579179374ab405e98b3b6