Merge "Use std::unique_ptr instead of UniquePtr."
am: 22b7e496c2

* commit '22b7e496c23c76b1f6d94e3ce99f39f9d3bca973':
  Use std::unique_ptr instead of UniquePtr.