Merge "Rename NullHandle to ScopedNullHandle"
am: 76b90e37df

* commit '76b90e37dfe6eecc904017be8046dd208d30ab8b':
  Rename NullHandle to ScopedNullHandle