preferring advertizing identifier as deviceId

- backward supporting older devices