am 6cc20192: Merge "Fix ConcurrentModificationException in PersistentDataStore" into lmp-dev

* commit '6cc201929764089c49d777ed983ee776b38054e6':
  Fix ConcurrentModificationException in PersistentDataStore