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

Change-Id: Iae83cebe615d0df3a6f2c6bdee6f8002d3ae82b0