Merge "Change UniquePtr to std::unique_ptr" into oc-mr1-dev