Merge "Use HeapReference for SafeGetClass"
am: a27a718f3a

Change-Id: I24f4102f547b400afb612c87f62e24955698fd8e