am a3a7bcbd: am 6385ff51: Merge "Advise persist threshold outside NPMS lock." into jb-dev

* commit 'a3a7bcbda43ebddbf7bdd70c12258d1f1066c931':
  Advise persist threshold outside NPMS lock.