Merge "Clear calling uid before changing whitelist" into oc-dev am: 97e3db9aee
am: d74a51bd62

Change-Id: I2da254531ea4d5e24828501cadb2b37c28ce8719