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

Change-Id: Ifb3c8cb52644189de60c36da7a41e584cc6f820a