Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d88
am: 2399d935bc

Change-Id: Ib219c4c5299b681b6f3858cb67c70a7fd9110f20