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

Change-Id: Ib0e20e79c8d9708845aede08f86d17bb08855642