Merge "Null check thread peers in JVMTI class callbacks" am: 698bd05488 am: e5bbcbc94c am: 56046cc16b
am: ed74e2490e

Change-Id: Ib4ce9b7516b3239ecff1f450f73f311904b54742