am ee779335: am f16344c7: Merge "Fix HandleScope with wrong thread error"

* commit 'ee779335fbc5a3d312331d9efb7212a0051db868':
  Fix HandleScope with wrong thread error