Merge "Updating network info state should return true." into oc-dev