Style cleanup for ObjPtr<>-ify changes. am: 0984e483c1 am: 7b19295427
am: 56b185a22c

Change-Id: Ibca25a730720c674666829caf7acfaa6f95cec71