Merge "Inject last location in InjectBestLocation VTS test" into pi-dev