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

Change-Id: I233d796cf67a71ebc43970f949930de46a0ddb3f