Merge "[V3] Renaming policy_client into policies_client"