Merge "Reland: Remove workarounds by data_device_bins" into tm-dev