Merge "Fix race conditions between Tethering and TetherInterfaceStateMachine" into nyc-mr1-dev