Merge "Do not depend on Tethering stubs in CM consts"