Merge "[automerger skipped] Merge "Reset wifi tethering state when failing in QS." into pi-dev am: 76af93f6 am: 90ea1705 -s ours"