Merge "Address comments from HandleScope change."