Merge "Change TetheringConstants class to final" into rvc-dev