Merge "Add var to enable/disable tethering next APEX"