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

Change-Id: I0c236799c7b734bce2fff85a00b8511acd8e001b