Merge "Use HeapReference for SafeGetClass" am: a27a718f3a
am: 645b662e90

Change-Id: Ic1c1bd6fe376d504ecabb06a467597a8596b8947