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

Change-Id: I34baf9585108d008e4ad2357e97c696e64760b3b