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

* commit '053490cedb8cb349cbcedbad652e7cf83c1b8a03':
  Fix issue with verification check failure on erroneous classes.

Change-Id: If8df1134bcdd077bee4cf5285f470ef3a84fe8fc