Merge "Change UniquePtr to std::unique_ptr" into oc-mr1-dev am: 5b1a00f4af
am: d636f6138a

Change-Id: If127156a6ed9ed1028442304a09c9ff99603bd72