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 am: 497520a1e8  -s ours am: a2fbb123da  -s ours
am: 1716a48906  -s ours

Change-Id: I4f1c5500ec3f37d9b4b6df44c6bb67d93d7bbb44