Merge "Reset wifi tethering state when failing in QS." into pi-dev
am: 76af93f6d4

Change-Id: I81f7ae9018eeb50fa070a559b12a3bbe10c2e3cb