Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88 am: 2399d935bc
am: f32424b90d

Change-Id: I405bee24b11319430e3490f3299d9c8b6438e407