Merge "Change TetheringConstants class to final"