am c09e5911: Merge "Fix error when PAC set rapidly" into klp-dev

* commit 'c09e59110272d2613763a54a57e7da7c9f87f369':
  Fix error when PAC set rapidly