Merge "Fix NPE in tethering startup" am: 6bf0c6185d

Change-Id: Ife21cf93c62be0a7da2dee77d31a8f3c9b23b575