Merge "Change MANAGE_OWN_CALLS permission to be a "normal" permission." into oc-dev