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

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