Merge "Record class status after verification."
am: 25009fdd7a

Change-Id: I28f26f8df620687c3c2124812e7f228eb53d7e2e