Merge "Remove bits about kPoison in ObjPtr's documentation." am: 34acbf4525
am: c0dc9a3b40

Change-Id: Ib4242ee481792d6fd4f7b6b375b9bd01a2252321