Merge "Fix NPE in tethering startup"