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

Change-Id: I808bd4a2a0339ecf98ea963102b52be18d52db9a