Merge "Fix issue with verification check failure on erroneous classes." am: 03bea09 am: 053490c
am: 0c34388

* commit '0c343887e3b52b3748d4fee6c37b7fb41dd0796a':
  Fix issue with verification check failure on erroneous classes.

Change-Id: I701df0c1c806432ee74818bcc6780257b813e03f