Merge "Fix clean InProcessTethering fail problem"