Merge "TetheringManager API clean up" into rvc-dev