Merge "Change TetheringConstants class to final" am: 2f92c8d4 am: 34c9af30 am: d0d7946c am: abcd7618 Change-Id: Icca30a44123b6da2cdf5b43458ee546dd031cf0f