Bug 978593 - refactor and cleanup NetworkLocationProvider
Cell record support