Merge "Stop location to avoid timing issue" into android10-tests-dev