Clean up creating handles from `this`.
am: 3068d582ef

Change-Id: I05f37381661dbc8986e6a3968fb7f59af963dc1e