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

Change-Id: I7f949fddaa76913a5604163fdc73f6d0c8859085