am fb0caad4: Merge "Ack, wrap advisePersistThreshold() in lock." into jb-dev

* commit 'fb0caad42353687e63cd560dc7fb028b8439edde':
  Ack, wrap advisePersistThreshold() in lock.