Merge "Fix issue where classes that fail verification have kStatusNotReady." into oc-mr1-dev