Merge "Tethering: check if configManager is null" into nyc-mr1-dev