LPS-43591 and LPS-45491 Apply fix at the LocalService level

Hey Minchau,

Do you mind verifying that this fixes your bug as expected? If so, just let me know and I'll submit it.