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

Change-Id: I83b8be56079bd6101f1845ad3fa6714312c1d0ca