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

Change-Id: Ifa46a3dce735778e99c115ac6499c71d05a2068b