Merge "Reorder LocationManager methods"