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

Change-Id: I09f8c134edef5c4cf67805faaf8cd56cae65ed69