Merge "Fix NPE in tethering startup" am: 6bf0c6185d am: 4b9770b9f5 am: c755a813f4

Change-Id: I6d0796f470d2f52350db96f0b6e5b0c7caeddb3d