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

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