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

Change-Id: I636624656ef7f6b51b334f524554c0cd40833c04