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

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