Merge "Refactor LocationManager2Test"