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

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