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

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