Merge "Stop explicitly using kCallerPasses_Ownership"