Merge "Mitigate race conditions in PacService"