Add a null check before reference networkInfo. am: b8eaf45e1d am: dca8f10031 am: a12d383117
am: 21e0927b47

* commit '21e0927b474a686d5827e059476291370c0b306e':
  Add a null check before reference networkInfo.