Merge "Clear calling uid before changing whitelist" into oc-dev