Merge "Wrong parameter in LocationManagerService"