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

* commit '6385ff511dd998f1fbb189621270e2c19577f66e':
  Advise persist threshold outside NPMS lock.