Merge "Remove buffer_hub_service compat mapping"