Merge "Remove UniquePtr.h copy"