Merge "Correctly check permission and app identity for tethering"