Merge "Change UniquePtr to std::unique_ptr" am: 625d6a8cd8 am: 354b29975e
am: 9b9286a2eb

Change-Id: I646cfff42744dcaac2cec24e3978667fd3108841