Merge "Set the tether Entitlement app as active when enabling tethering." into nyc-mr1-dev