Merge "Passing callingUid to internal methods" into oc-dev am: dacdf2e978
am: de066fd249

Change-Id: Ic66a91417dabf23ee798f5f38696e6fe543e9803