Merge "Fix ConcurrentModificationException in PersistentDataStore" into lmp-dev