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