Cherrypick LocationManagerService FC fix