Merge "Mitigate race conditions in PacService" am: d7942eef48 am: 6cd7b812ca am: c19a2ed00d

Change-Id: Ibd7b037d692ef478c36a05d1ba2ab4231fc1dc44