Merge "Update the policy scope to 'OSDF_DUBLIN'"