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

Change-Id: If2d1d5203bdc8dd92cf41061b40b58da9b0de5d6