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

Change-Id: Ie51de865fe15395776837c181123af61b85791df