Rever: Cherrypick LocationManagerService FC fix