Merge "Pass changed NetworkInfo to LocationProvider." into jb-mr1-dev