Merge "TetheringManager API clean up"