am 5200a9bc: Merge "Address comments from HandleScope change."

* commit '5200a9bc07e9b27dbe9c95a3043ba8265128b1a3':
  Address comments from HandleScope change.