Merge "Add config_tether_* and entitlement resources"