Issue with entity_id with double underscore ( __ ) in HA 0.104

Starting with HA 0.104 i started receiving errors about entities with double underscore __.
I renamed all the custom ones in earlier versions when the warning messages started, but these are auto-created entities from Nest, and didn’t produce any warning.

2020-02-07 11:54:01 ERROR (MainThread) [homeassistant.core] Error doing job: Exception in callback async_setup_entity_restore.<locals>._write_unavailable_states(<Event homeassistant_start[L]>) at /usr/src/homeassistant/homeassistant/helpers/entity_registry.py:502
Traceback (most recent call last):
  File "/usr/local/lib/python3.7/asyncio/events.py", line 88, in _run
    self._context.run(self._callback, *self._args)
  File "/usr/src/homeassistant/homeassistant/helpers/entity_registry.py", line 526, in _write_unavailable_states
    states.async_set(entry.entity_id, STATE_UNAVAILABLE, attrs)
  File "/usr/src/homeassistant/homeassistant/core.py", line 977, in async_set
    state = State(entity_id, new_state, attributes, last_changed, None, context)
  File "/usr/src/homeassistant/homeassistant/core.py", line 715, in __init__
    f"Invalid entity id encountered: {entity_id}. "
homeassistant.exceptions.InvalidEntityFormatError: Invalid entity id encountered: binary_sensor.logans_room_camera_logans_room_nestcam__zone_1_activity. Format should be <domain>.<object_id>

The entity shows as Unavailable in the Entities config page, and trying to rename, disable, or make any change produces the following error:

2020-02-07 12:09:56 ERROR (MainThread) [homeassistant.components.websocket_api.http.connection.140165217761872] Error hand
ling message: Entity ID binary_sensor.logans_room_camera_logans_room_nestcam__zone_1_activity is an invalid entity id for
dictionary value @ data['entity_id']. Got 'binary_sensor.logans_room_camera_logans_room_nestcam__zone_1_activity'

Is there some way to edit this entity_id from storage, or some other way to resolve this?

Currently running HA Core 0.105.2.

Thanks.