Merge "Data model classes to track flash wear changes"