Merge "Reset protection in PersistentDataBlockManager"