Merge "Passing callingUid to internal methods" into oc-dev