Merge "Fix test location provider bug" into pi-dev