Merge "Fix some @hide usage in Tethering"