am 31b6a4ef: am 5b4fdaa0: am ee84e875: am 9c418157: Fixed issue where location from network feature was not properly ignored.

* commit '31b6a4eff14fa031c44639d316751dd825fab0be':