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

Change-Id: Ic20eb0c58acb65cb81f97933cb0633c6bfc54e8e