Merge "Fix clean InProcessTethering fail problem" am: bd83df66f8 am: 5faa2ebe67

Change-Id: I76e5e2b5b4f82203abb85aadf7252b351dc1b4bf