Merge "Handle spurious wakeups in VerifyClass"
am: 163c540b46

Change-Id: Ib62e54f59ac0247563b175b7731f50ef2d57912f