Merge "Fix issue where classes that fail verification have kStatusNotReady." am: c7c25d5b4c
am: aae4a5ce00

Change-Id: I9bb0a054bc4973e17240efb870780131024a67d6