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

Change-Id: I0cd79bbac2f0cd10d6be509525c08e0c134af767