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

Change-Id: I27935ec521473b8ef09154fe3c5a9753a4c2704a