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

* commit '03bea09898e81078e3d116f580e74d5b1911ea39':
  Fix issue with verification check failure on erroneous classes.

Change-Id: I39a584f6c46653109617962661971872de08d7e8