Merge "Make members final in TetheringService" into rvc-dev