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

Change-Id: I2250d3b541c7b1696fe31441df0b01890bc1c41a