Merge "Fix clean InProcessTethering fail problem"
am: bd83df66f8

Change-Id: Ifa8e7e4ac7c4d48e149a8a6d797d8f964603a95a