Merge "Tethering: check if configManager is null" am: e011bf80c5 am: d1e4dbf002
am: d33a0ee710

Change-Id: I2d8cfac1093b6973b2b5f06e2ba37cff9866d82a