Merge "Handle spurious wakeups in VerifyClass"