Merge "Return the right value in VerifyClass."
am: 742bc41f75

Change-Id: I4afae9b1bb7585c74dcaee427c0668d46fa3876d