Merge "Fix dead lock in Tethering state machine"
am: 355dbae680

Change-Id: Idd08726f3eeebba49a9ad909464377af67600d30