Merge "Ensure 'modified' field of ArtClassDefinition is always initialized." am: 238fdfcec3
am: 8861b265e8

Change-Id: I2b5e38943ab20e90469329001484d51f6c0e70f3