Merge "Rename NullHandle to ScopedNullHandle" am: 76b90e37df
am: 8a5e8d0118

* commit '8a5e8d0118de17210316100e740d0417239256e9':
  Rename NullHandle to ScopedNullHandle