Merge "Mitigate race conditions in PacService" am: d7942eef48

Change-Id: I420dd2720c5d447e2d6f94ea09f4f02a0a0600c4