Merge "Mark UniquePtr as deprecated."
am: 1491f3a2e2

Change-Id: Ie2713a50d0d37017c1f0163c6081683328dc849e