Merge "Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am:...

Merge "Merge "Stop explicitly using kCallerPasses_Ownership" into nyc-dev am: cfe2352d am: 2399d935 am: f32424b9 am: 54c2cbb0 am: 85a68d9e  -s ours am: d9c818dc  -s ours am: 497520a1  -s ours am: a2fbb123  -s ours" into oc-mr1-dev-plus-aosp
am: 302eeadd  -s ours

Change-Id: I721a2346c030251c334661b97b337d4883c012d8