Check in UniquePtr.h locally am: 3d78edca77
am: dc10e4109c

Change-Id: I5edc3d3530533e9c0b645d9d1006663b1ef7eacf