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

Change-Id: Icc4c5fb0007533a611cabc13fa89a03dcc3ea4af