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

Change-Id: I8efee11eee261208674c1e00f40ef702bc6ad66a