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

Change-Id: Ia2cc89325e9d7d7d9d99f2bd536998b00b9e2ddf