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

Change-Id: Iecd0b51c38304a1d00c7a5b209cfe592cc3b9c75