Merge "Use std::unique_ptr instead of UniquePtr."
am: 0f61f86870

* commit '0f61f868703ef078f51549a41c1e59960692cd42':
  Use std::unique_ptr instead of UniquePtr.