Merge "Change UniquePtr to std::unique_ptr"