Merge "Upgrade test runner for location api"