Merge "Record class status after verification." into oc-dev am: 26013c945c
am: bb1626c330

Change-Id: I197707b91913b17cc912af868b627a1194025fd1